Fix failing test for 18115, address issue #18 (could not reproduce)