changed to work with django 1.3