* Fixed type check