Fixed bug with Atom