Prod bug fix #3