Fixed a defect introduced in last commit