fixed last bug for v1 production