Fixed bugs Enrique