fix issue with unreturned Promise that resulted in a series of late firing callbacks