0204: fixed stopWhenUnloading at new mode2 approach

#762