real fix for django 1.6+