fix error with promise collisions