Fixed buggs in disrupt