Fix #3380