Fixed major bug where interrupted thread made stuff go crazy