Throwable junk bug fix