Fix #3228