First fix for #1714