0.90 compatibility