implementation for #1469