Fixes #67 again