Changes to fix the problem when xpp is typed.
Merge pull request #283 from carlosdcastillo/xpp-fix-pr

Changes to fix the problem when xpp is typed.