bug fix build structure