Fixed for I-137967(https://appirio.my.salesforce.com/a3v50000000D2Lt)