Fix for #1444