bug fix to master v1.1 for production
resolve merge conflict