Fixing default handling