optimize builder (add a trick for the download builder)