Fixed 'Bug 17653 - Wrong completion entry in tuple factory method'