bug fixxed #7.1