Temporary patch (a cleaner one will be pushed by tomorrow noon) - adrien