0.9 compatibility