fix #15 (Exit returning is broken)