Fix to the build without losing the latest commits

Working fine