porting Daniela's recommendation