K2

Fix for WF-1631.