made compat with 2.0 lib