improve build robustness