fixed according to PR comments