Fixes issue #9 (really this time)