Fixed issue with promise object not propagating correctly