Fixed infinite loop on Core creation
Fixed merge conflict