Implement @mhvk's comments [skip ci]