bug fix, v1.2 for production