Fix for the ticket 1504