Thanks to Derek for a patch.