Fixes issue 1648