first try to fix unresponsive behaviour