bug fix and ST 2 support