Fix issues 7 and 8