[issue #10] fixed