Prod bug fix #5