Fix nfr #1238

Fix nfr #1238