partly fixed #8