This patch fixes issue 7123