Fix Client to remove unchecked casting error. Fixes #6