Workaround to get buid properly working