Added 'p' message substitution