Fix for #1456