Fixed the issues : artf503593, artf607619