Ticket 1031 workaround?