Fixed bug in atomic patch that interfered with non-atomic variants