Fix the bug with a workaround