Fix for work in ST3