comment removed and bug fix