fixed upgrade issue
Merge pull request #625 from kurund/upgrade-fixes

fixed upgrade issue