Add Duncan's fix from fucking ages ago

Duncan is a lazy, lazy bastard.