2141: Fixed edge case on reviewing without modifing subs