Fixed riff generation