fix conflicting typedef