fixed default handling