Bug fix for 2.0.5