fixed merged for #3257