Added accounting for singleton inverses