RPG: Yet another fix to /plan