Fixes issue #1167.