Fix Type Declaration consistency TODO reproduce