Fix Busy Loop issue #68