Fix to bring responsiveness