Fix duplicate action bug