FixingSomeIssues