modify to django 1.5