wip compatibility for 1.0