Fixed for Django 1.5