fixes internal #689