Done! fix the bug