fixed a super weird bug
Merge branch 'classic' into gh-pages