Fixed Auto-aligning Bug