fixed #3, solved #10