modification for django >=1.6