7.1.2 fix

A better fix than previous.