- Enhance compatibility fix for #112