Temp promise fix