This corrects the issue arose from the semantic conflict of a65a6963 and cdadf978 which got merged consecutively without having a chance to spot and correct the issue.
Request review @chub.