Put atom fix into seperate plugin (AtomExtend)