First attempt at fixing case issue.
Part 2 of fixing case issue.