fix for FABRIC-6