Optimizing fix for WF-1715