FIXED THE HORRIBLE BUG OF DEATH