Fixed so post hooks can alter the return value