Possibly better hack to prevent crashes
Merge branch 'master' into ST3