Added fix for feedback 500 issue