fix return too soon