Adding changes for more compatibility with promise a+.