Bug fixed for initial production