Fixing more responsiveness