typedef fix