fix given by Fayaza for SS-395 commited. Added another similar fix too.