fixed issure #12