Don't bind webclients in singleton scope, fix bug