Fixed submission according to latest change in API