fix issue #4 (early return)