applying @josenavas sugestions