More robust retort detection