- fix bug happening when running on a clean db
Merge remote-tracking branch 'origin/master'