[PATCH v7 6/6] Fix