fix in client.js and template