Fix objectseries ? as in mainline