Adds a permanent work-around for the long standing issue #10. Closes #10