Fixed Encountered. Needs API changes.