Fixes #93; temp fix ONLY!!