fix for FABRICTHREE-707