bug fix, V1.1 for production