Fixes issue #326