TEMP: temporary addition to pinpoint a crash from Niklas