Bug fix in last change