Fix Ticket #923 by breaking Ticket #913