Fix to work with latest preamble.