issue #621 many promise fixes