Fixed core.cs