Another pm bugfix