quick fix on current build methods