Does this fix InvalidDataAccessApiUsageException?