FIXING ERROS