fixed #6. Fixed #7
fixed #6. Fixed #7