fix for feedback and error handling