Fixed default issue