fixed #7
fixed #7 and fixed #8