Fix for weaver check