#92: Improvement