Be more reasonable about the oracle dependency