New build with fix from prev commit