Issue # 1119