Fix issue when explicit casing is used