Fixed Issue # 1029