fix for setting the entry order properly with asynchronous entry resolve