fixed some unresponsiveness