Fix #4346