Finally fix that weird fucking bug