Fix for #1404