Fix issue 7540