Avoid when.js calling the wrapper constructor
Build v0.6.1-4