Fix Object error in common helper again