suggested fix by 'daurnimator' for issue #8