Fix #2928, #2929
2 files changed