Address @ematiu's comments