Extension fix