fix circular dependency
Merge pull request #2 from nextlanding/production

fix circular dependency