Addendum #238

A very dirty fix I don't fully understand myself. Investigate later.