b3ee485 fixed responsiveness issues