re-commit for 0.49