PM lookup bugfix