Fixed Crash + case sensitivity issue