Make consistent with Atom implementation