Re-commit. And minor fix.