Code

Patch to fix return values. Fixes bug #530790.