more 2.x compat (#10)