fixed issure #14