fixing BR #18