Making it work again so the build passes