Fix for #1362