fixed issure #17