Fixed up default handling logic