Fixes WF-1683