Commented out jedi to see if it stops hangs