test fix for #1459 / #1451