3087 Update to work with the even/odd class removal
Merge pull request #1702 from sarken/issue_3087

3087 Update to work with the even/odd class removal