Last pm bugfix