Fix to use sufficient info