Will this fix the bug? hmm