I mishandled your changes - sorry about that. Next commit will rectify this.