FIXED the Bug