Fix stack overflow when unwrapping values client side (fixes #54)