fix ATOMICITY issue