Fix bug during standardizing build