Fix for #1309