Try to fix "not responding" bug