fix getting stuck