Fixes issue #45