Added fix for more atomic update types