Fix issues 17 and 18