fix synchronous issues