Made it compile and work again ;)