Enhances change in commit #78e70e0.