Fixed a problem introduced by the previous merge (e26e34e244e8)
Fixed a problem introduced by the previous merge (e26e34e244e8)

sccblom/vercors,sccblom/vercors,sccblom/vercors,sccblom/vercors,sccblom/vercors