issue #3360 plus related fix