Temporary fix for ST2