Fixed to work with latest version of Atom