Fixed Atom parser