added in minor cases