Redone return splitting for fix issue #4