ST3 compatibility #15