fixed errorrs 1182957 and
1182975