Fix Objective-C related key to exapnd on