bugs on the code: Fixed