2.9.2 compatibility