Bug fix to buildcontrol