Make ST3 compliant