Fixed typedef conflict