fixed optimzation for Atom