2.0.2 compatibility