Mantis Ticket 0003814

changes for the feedback