Attempt to re-fix issue #9, tested and working