Fix #2351