Fix #3397