Fix #2644 in release-0.1