fixed issure #7