Merge pull request #2333 from joelmartinez/docs-classic-fix