added Gary's fix, didn't work...
(#563)