Mantis Ticket 0004388

This is the fix for the Feedback