fix after feedback