fixed a bug
Merge branch 'release-lizzie'