Another atempt to fix build process