Fix #1158 against 0.8.0 branch.