Fixed the erros