Fix issues 3 & 4