fixed #3

relatively, #5 is also fixed