[PATCH 2/4] Fix remove wrong extended prefix