improve retrocompatibility