Fixes issue #325