Apply leo's fix to marquees.