More fixing on the atmoicAdd issue