Fix for #1555