Fix the bug's and fast