Add back the check for built units