Merge "Fix function/class case"