Online feature fix