0.6.5.0 compatibility