Init fork
Merge fix