0.80 re-commit, minor fix