PM: fix validation