fixed duplicate client stuff