Fix for >django 1.3