Fixed CheckCase issue reported by Antonio