Consistent fix with non-API version

Also with test, feel free to squash into one commit with yours.