Minor code layout change
Avoid Mysql error on restore