Fix issue 13 and 14.