Fixed the bug