Missed that the last fix broke a working test, so a new fix that works for every case.
Missed that the last fix broke a working test, so a new fix that works for every case.

Jabe/irony,enginekit/irony,dbremner/irony,Jabe/irony,Jabe/irony,enginekit/irony,enginekit/irony,dbremner/irony,dbremner/irony