@ohadlevy  switched to using kind_of? instead of class.name ==