Fix for django 1.6++