fixed issure #5