Fixing a tiny issue with setting defaults correctly.