Fixed crash
Fixed case sensitive issues