hot fix for customer 500 note issue