core-4569 fix validation