bugfix for ST2