Fix Marc Riera bug report