Fix Overflow and positions