Bugfix Pmsgs
Bugfix 2