Fixed default handling