Small additional fix for #1655