Endless Load Bug Fix?

FInally had an idea on how to fix the endless load bug, hopefully this will put it to rest forever.