fix on duplicate fn (from merge)