WIP fixing production build