Fixed return values for current top level followup