better async handling, fix #132