Ticket #1041: Making things simpler