Fix for unnecessary static db in last commit