Avant-modal fix