fixing a problem in production
Merge branch 'release/1.0.5'