minor robustness tweak