fixed issues(to 19)