fixed issure #9