Address @Ivoz's comments from 82b9bfa3019173533