make update from 2.6 more reliable in extreme situations