restored fixes