Fix for ST3