changes as suggested by David Baumgold
Merge pull request #4311 from edx/asadiqbal08/changes_as_suggested_by_singingwolfboy

changes as suggested by David Baumgold