Um... Idk why its like this, i did a rebase... but fixed npe