Consistent #3658