Fix for Django 1.6