improved compatibility