v0.0.2525 Hot Fix