Fix #2844