Fix for #1350