Fix NFR #1087