bug fix v 1.1 for production