artf838339 , artf835485 - bug fixing.