Fixes 'lock up' issue


More...