Fix for #1330