Fix bug that causes options replacement