additional fix for #1587