One more improvement for #1552