Bad fix (to replace with Janno's)

2 jobs for !798 with paolo/fix-461 in 7 minutes and 59 seconds (queued for 7 seconds)
merge request