WIP: 3.6 compatibility