polishing

relates #5261