Fixes #634

@flukeout you want to try this out?