diff --git a/src/analyze.cpp b/src/analyze.cpp
index 870f06dfe856d3e2fd408a2ad22ea8e418bccc16..4f806b9e1be6337248d7748b0b5a399f7ab56d11 100644
--- a/src/analyze.cpp
+++ b/src/analyze.cpp
@@ -2954,14 +2954,14 @@ bool handle_is_ptr(TypeTableEntry *type_entry) {
         case TypeTableEntryIdArray:
         case TypeTableEntryIdStruct:
         case TypeTableEntryIdUnion:
-             return true;
+             return type_has_bits(type_entry);
         case TypeTableEntryIdErrorUnion:
              return type_has_bits(type_entry->data.error.child_type);
         case TypeTableEntryIdEnum:
              assert(type_entry->data.enumeration.complete);
              return type_entry->data.enumeration.gen_field_count != 0;
         case TypeTableEntryIdMaybe:
-             return !type_entry->data.maybe.child_type->zero_bits &&
+             return type_has_bits(type_entry->data.maybe.child_type) &&
                     type_entry->data.maybe.child_type->id != TypeTableEntryIdPointer &&
                     type_entry->data.maybe.child_type->id != TypeTableEntryIdFn;
         case TypeTableEntryIdTypeDecl: