Address @nden's comments