ST3 support/bugfix (close #1)