Fixes issue 1912