fix after feedback #2