Bug fix for removing ATOMIC_WAIT actions