Fixed issue with "*" in type