Re #5966 Improve command