Fixed shortcut (p,s) bug.