Make the conditions more robust against change