adding robustness check