Bugfix + ST3 Compatibility