Fixes #93 properly