improved latex support