Thanks to oliebol for hunting down a bug that has been haunting me for weeks.