Consistent fix with non-API version

Also with test