Fix commit ced9adc3bb963c62be395f6d9f1a5ce5448939de
Refactoring build process