Improvement: non-responsive mode

Fix bug and improvement the option Responsive mode