Fix promise returning