[#759] Fixed overall responsiveness