Consistent #1640