Fix for #1055.