#170 PR feedback from @petkaantonov