Fixing bug mentioned at the workshop.