[FIX] once and for all removed ambiguity problems of atomic primitives