Oops, fix return value problem in last commit.