fix according to PR comments