Fix recursive build issue