PR that works even for ST3