Fix for Fabric module issue #4