[FIX] Fix the working of ATOMIC suport.