Address @OlegHahm's comments