Fix for FABRIC-947 from Claus