Improvement to #27