Promises fix #33