bug fixed v 1.1 for production