Fix action generation