#6595: Almost done