Add regression for issue 6191 (#6264)