fixed #15, fast return