more 2.x support (#12)