Building with bug fix