Fix WK-349