More fix for promises