Fix for WF-1631