bug fix it #2