Minor bug fix for 2.0.1