fix for FABRIC-18