*Fixing handling return state.