Fix for WF-1605