Defect fix.. bug id#25