Fix production issue