Fix action display bug (bad merge)