Add a test for #651 and really fix #651 this time (another manifestation of the same underlying issue as #652)