Fixes the issue with production. Ready for v1.2.0.1