Issue # 1079