fix for #1469