Need to fix Infinite Loop Lockup