Improvement suggested by K7L