Refs #1 fixed

Bug fix of the issue with index change on rotation.