Hotfix: Chasing log buffer issue