Fix return value on client side