v0.25 type mismatch fix