fix bug PIM-3095

Conflicts:
	CHANGELOG.md