fixed issure #10