Fixed Issue # 1029

Fixed Issue # 1029