bug#1969 modified