Fix bug that causes unusual behavior due to option mutation