Fix equiv ipmplementation