Added rosatomic fix