FIX THE BUG