Issue 67

Fixes #67 

Have to be tester in upgrade case before merge.