Re #1135 Fixing the API v1 resolving issue.