bugfix
Merge pull request #810 from edx/e0d/es-bugfix

bugfix