Quick hack to help trace the cause of the lock up issue...