fix given by Fayaza for SS-395 commited.