Better fix for the Django 1.3 compat