fixed #7 and 8#