Fix order of remote model promise resolution