fixing feedback, fixes #31, #44