make tidy more robust