FIXED THE BUG