Fixed a bug that was overwriting default options under certain circumstances