Hopefully fixes django 1.4/1.5