Fix for Ticket 1504 Final