fixed issure #2