Fixed major bug with typing different CC types