0.24 compatibility