Fixes issue #414