Fix WK-312