Fix not-so-responsive bug