Fix [i] [x]
Fix Issue #2