changes in last bugs sended from gustavo, githu bugs #9