Solved odd/even problem
Solved odd/even problem
merge fix