backwards compat for <1.6