Issue with atomicity fixed