Fixed error where default values not set on first run.