Fix redirect and drop duplicated action