Commented out django fixup since it interferes breaks the code when no django installed