Another attempt at fixing the introspection bug