(Maybe) fix issue #13. This could very possibly break something else