Fixed TheTicket #1465