Bug fix for %n & %p.