FIX: More safety for going back while stuff is uncloaking