Fix issues 5,6