fixing volatileFix and others...