Fixing #157

I'd like to make this easy for you.