Merge pull request #1080 from popojargo/fxi/production-build

Fix production build