1.81 issue #31