Make this correct even for the older port