Build bug fix