fixes FABRIC-727