Issue # 1049