attempt to fix problem reported by Tomas for FABRIC-6