Fix #2844
Fix #2845