Opps. Add compatibility with < 0.6.5