Fixed Option erros