Fixed buggy default logic