Fixed behavior on st3