Fixed a bug where the defaults were overwriting the actual set values