Eluna Fix checking of objects with varying types