Ticket 13655

This fixes the ticket similar to what kudrom suggested.