Cleaned up fix for #53

Ashamed, I am.