Fix start order resolving bug