Fix to support Spotfire