WIP 2.2 compatibility