This is fix for the issue reported in: ATR-20116 @somadutt is offline so I stepped in and made this fix.