additional fix for #1561