adjust to recent version