Handle public and PM
Fix log message