Fix WK-374