media build: even more hacky robustness