v2.1 - Minor bug fix