bug fix re: FEND-947/FEND-847