Fix WK-387