Compat with 2.9.x