Tests pass, but unsure if bug is fixed.

https://code.djangoproject.com/ticket/18400

Please review this pull request. I am unsure on what is the best way to test the new code change on the command terminal.