Fixed a problem with type and function parsing