finetune for compatibility with 3.0