Fix #3835