Fixed bug and send to pancho