Responsiveness fix #2