Added fix from Prod