Fixed the Bug