Fixed Weird Bug

Fix 1
Fix 2

Fix