Begin of build fix