PM: put back version check