Fixes issue #34