#1794 improve