fixed #errors