Try change made by benjaoming on django-nyt