fixed client, refs #5