Fixes issue #46