See #63, #64. Add backwards comptability for fix when used with newer Atom.