Fixes issue #78