added feedback on set - and another fix