fix getting stuck
fix getting stuck