Fixes #634

@flukeout you want to try this out?
see, isn't this much nicer ^_^