fixing issues raised by Trindade