Fixed for R 3.0.1