Fix a bug where options wouldn't be applied correctly