Fix #121 - Fix broken 2.0 -> 2.1 upgrade