fix found for that thread never ending error, still needs to be refined and thought about