Build bug fixed