RPG: Punish fix