fixed # 1102