Bug fixed for production