Bug fix for things introduced in 1.0.1