1.90.0 compatibility