Fix #2928, #2929