8.0 return correct return code, no tee, fixes #24