Another fixes for #1670