Fix volatile issue