Fix creation & extension