Fix #3385