master is subtly incorrect, but so is this