Attempt to fix debugging timeout bug