Urgent patch for https://github.com/Constellation/taberareloo/pull/186