Add OS-dependent robustness