Bugfix for ST3 "module not found" issue
Forgot to commit some parts of the bugfix