0.96 compatibility