Finally fix that fu**** bug