fixing same-diff plugin issues