Fix issure #13