Fix for issue #21, hopefully