[#177] More responsiveness