bugfix fixes #4098
fixing merge