Making it django 1.5 compatible!