0.6.5 compatibility