Last-minute bug fix for v0.9.8