Tried to make the build stable