v0.5.9.0 Fix for 0.25