issue 3229 fix included