Make sure to save the port