Fix multiple promise completion