Actually fixes the bug