bug fix, v1.1 for roduction