*9009* Fix comparing types