Fix for issue PRD-1313

Tested by JS tests