Fix weird condition in detecting v1 objects