bug fixed for production