Try to fix bug I just added somehow