Defaults working more properly