Fixes #333, now properly