Fix for #1363