Fix for #1325