Make conditions more precise