Production bug fixing