Fix issue #753

And restore @PaulKinlan's sanity : )