FInally fixed the bug, I hope.