take into account PR comments from @octo