Adapted vignette handling to new behaviour.