#1987 improvements