bug fix

bug fix for v1.1 production